git merge tool demo

visit shbcf.ru